<<<<<<< HEAD
<template>
  <div id="app">
    <img src="./assets/logo.png">
    <router-view></router-view>
  </div>
</template>

<script>
export default {
  name: 'app'
}
</script>

<style>
#app {
  font-family: 'Avenir', Helvetica, Arial, sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-align: center;
  color: #2c3e50;
  margin-top: 60px;
}
</style>
=======
<!--<template>-->
  <!--<div id="main">-->
    <!--<router-view></router-view> //路由组件-->
  <!--</div>-->
<!--</template>-->
<!--<script>-->
  <!--import store from './vuex/store' //后面讲vuex 配置会提到-->
  <!--export default {-->
    <!--store-->
  <!--}-->
<!--</script>-->
<!--<style>-->
  <!--#main {-->
    <!--width:100%;-->
    <!--height:100%;-->
  <!--}-->
<!--</style>-->


<template lang="pug">
  .app
    header
      Nav
    main
      Profile
      Content
</template>
<script>
  import Nav from 'components/nav.vue'
  import Profile from 'components/home/profile.vue'
  import Content from 'components/home/content.vue'
  export default {
    data () {
      return {

      }
    },
    components: {
        Nav,
        Profile,
        Content
    }
  }
</script>
<style >
  main{
    width: 1100px;
    margin: auto;
  }
  .nav-li {
    height: 48px;
    width: 100%;
    background-color: #44f874;
    color: #fff;
  }
  .nav-li li{
    float: left;
    width: 33.333%;
    height: 48px;
    line-height: 48px;
    text-align: center;
    list-style: none;
    cursor: pointer;
  }
</style>
>>>>>>> origin/dev1
